Cleanup some obsolete cruft....