removing a lot of extraneous junk that crept in