removed unnecesary commented code