Remove event handlers (for now) and add more services.h logic to sketch