Remove dead code and unneeded comments