Removed useless events and queue