Improvement/xxx/wordwalls cleanup