Some  more cleanup