Remove unneeded reporter, make dependencies clearer