Removed obsolete code.
Merge branch 'release'