7.4 cleanup