28017 cleanup