remove debug statements, add device names