Cleanup.
Merge pull request #967 from hneuer/cleanup

Cleanup.