some more cleanup [5]