Some more cleanup ...