Cleanups: dead code removal/etc.