Merge pull request #1127 from jmaas/master

More cleanup work