Cleaned up unused imports
Cleaned up event api, use one queue per subscription