Remove pmount dependency
Clean up
Merge branch 'master' into chewbacca