clean up outdated comments and unused code