No need to call List.indexOf before List.remove. Instead we can use boolean returned by List.remove

            List<String> history = horizontal ? horizontalHistory :
                                                verticalHistory;
            if (history.contains(name)) {
                history.remove(name);
                valid = false;