Removed unneccesary functions