removed unneccesities