fixes #7608 cleanup