fix base classes to remove cmd dep from service and update service to match design.
fix server delete flow to match service and command base.