7.0 refactoring

Probably better to remove the commented lines