Removed unused files.
Changed over from EventBus to Abstract methods