removed unneccesary code