Cleaning old commented out code