Clean up old commented out code