A bit of final cleanup