removed unncessary code