removed unneeded interface methods, which are now protected
Merge branch 'develop'