A few more cleanup