Some more minor cleanup