cleaning up old cruft