Cleanup some old cruft