Cleanup
Work on section refactoring [ci skip]