Cleaning up some old cruft