Remove unused code in Impl interface. Fixes #531
Merge pull request #533 from rojepp/fix_531

Remove unused code in Impl interface. Fixes #531
Merge pull request #536 from 7sharp9/master

Fix for #534