Yet some more cleanup