Code updates to remove device 1.