Removed event controller and placed event listerns in application run. Removed dead code and tests.