Clean deploy

Do not merge. Pending regression tests.
Yeah. So no need for that if statement. If it doesnt exist, its a no-op.