cleaned up some unused variables
cleaned up some more useless variables
Merge branch 'master' into npRmpi