[BW] some cleanup