Merge pull request #950 from nico/cleanup