first step of refactor to move adaptor behaviour out of notification service
removes unused code