some more cleanup [8]