Removed old code, added more system events to the control list.