Fixes to make pbe faster (again after refactoring of xcpot) Changes for reanabling old CPP_66 functionality

-removing of variable icorr, use of member-functions instead
-removal of icorrkeys module
-removal of hybridmix module
-cleanup at several places