Some more cleanup