small cleanups, dead code removal