- Cleaning up the old cruft