remove buttons
Merge branch 'release/2.2' into develop