remove the connect world and add the RPI flow