Removed custom event queue. It was causing hangs on JDK8