Removed unrequired computations for #314
Merge branch 'master' into issue314_psat