7.0 refactoring

I think it should be removed if not used.