Merge pull request #1375 from echampet/cleanup