Remove unnecessary base service