A little clean-up work before assembly support