Remove unecessary service for now