Cleanup, multi-lingual support