Cleanup code by removing unused methods and commented out code.