BS 3 cleanup