Removed some redundant commented out old code