Merge branch 'cw/remove' into next