EventGhost cleanup
Updates to Eventghost flow