Master 4.0 cleanup