Remove complicated device resolution logic