Remove old commented out code