Cleaning up old commented out code