Cleaning up old cruft