spring cleaning... strip out a load of crap