stone: configure before remove
Merge branch 'stone-fix-remove' into working