Cleanup some minor cruft