Reimplementing base service
Removed stuff