[TASK] EXT:lang CodeCleanup