Refactoring
remove entries from visual state