Remove statics v4

make PFGeometry a typical class - remove unused parts of it (as I understand the plan is to change to the CMS geometry in the future in any case)