Removed redundant calculations that are now being handled by the Core
Merge branch 'MP2_REWORK_Adjustment_to_newer_Core'