Cleanup unused code and comments