Removed Extra EventQueue