Cleaning up addon/polyglot