Some more cleanup changes