7.0 refactoring

commented code to remove