(Re)move reporting calls to their own serivce