Minor improvement to visuality removal