#546 cleanup device ordering