removed more unneccesary stuff