Removed address service and made event service 'cascade' save