Controller Removal Added

-Fixed issues with adding and removing controllers
-Pop-up is now properly dealt with with any scenario with two
controllers
-Generally Cleaned up unused imports