removed unneccesary function calls