add more clean-ups by Bruno