Seventh part of simplification refactoring