clean up CMS routing
clean up CMS routing
clean up CMS routing
Merge branch 'feature/clean-events' into develop