Sixth part of simplification refactoring