Remove comments
Merge branch 'v2.0-bug-fixes' into v2.0