Add dependencies to event-dispather
Remove used code in packaged version