yay more cleaning
more extraneous stuff removed