mpm cleanup

Well looks like I have an older version of cuda toolkit installed and I will need to update that If I'm to use the latest gcc.  So the unused var part is still not done.