Cleanup: remove deprecated code
Merge pull request #34 from PierreR/develop

Cleanup: remove deprecated code