Doing some more cleanup