Refactor sections, delete parts