removed unnecesary/commented code