Removed BaseService class