2bwm cleanup