Removed unneccesary code