Deleted old commented out code