some more cleanup [6]