Merge pull request #1572 from tpikonen/cleanup