Deleted irrelevant commented out code