Cleanup unneeded cruft