Fix: Return removed by mistake code for selection of deployment mode