Removed uncessary commented out code