Remove event subscriber and simplify services
