tidy up old cruft