removed unnececary functions