removed unecessary commented code