b4 cleanup