Did some more cleanup