remove the old code
Merge branch 'master'
Finish Release-2.0