Cleaned up and removed some deprecated interfaces...

... so please accept the pull request!