Misc cleanup and test removal.