some more cleanup [4]