Clean deploy

Do not merge. Pending regression tests.
Why not always delete it?