7.0 refactoring

line can be removed