removed a whole bunch of junk