removed unnecesary lines