Remove unused code in Impl interface. Fixes #531

Fix #531. This change was also included in PR #491. Sorry about mixing up several issues in one PR.