Merge pull request #1130 from jmaas/master

More cleanup work