Remove dead code and comments