Fix dependencies; Remove local service