services -> management
more cleanup/updates