removed unnecesary code