Even more using cleanup
Even more using cleanup
Merge pull request #323 from peternewman/trivial-fixes

More using cleanup