Remove thisArg.
Update support files.
Remove unused support files.