Some more cleanup etc