Cleanup (builder-style API; arrangement; duplicate deprecation)