Removed/replaced old EventSystem types and links.
removed old EventSystem link and fixed controller test