Remove some unused files
Remove some code obfuscation from mt_xxpand
Some more simplifications of mt_xxpand