tidy up of old crap