removed more unneccesary crap