More hacking
Remove junk controllers