Clean deploy

Do not merge. Pending regression tests.