Removed redundant commented out code