Clean up comments and dead code