Fixes: #1973 removing previous setup state
Fixes: #2016 Forbidding some orders to locked machines