remove dead code
small cleanups