Last cleanup for 2.0
Merge branch 'release/2.0'