Remove old commented out code - will be in version control history if needed