some more cleanup [7]