Remove Orange, remove some dead code from controllers.py and plugin.py