made event subscriptions synchronous
removed async event subscriptions