Remove useless dependency and service