Remove unused code
Merge branch 'release-2.0.0RC4'