8.0.0 cleanup unused