removed unneccesary commented code