removed some unecessary commented out code