Removed unnessesary code