clean up other managers
DRY design updates