cleanup + scope expandall to section