Doing some clean up