Merge pull request #667 from lburgazzoli/cleanup

Cleanup