Remove dependence on Run 2 luminosity legacy code

Related to Rec#395 (closed)