OP-1379 - fix severla issue with notification queue handling
OP-1370 - cleanup some unused code
include Notify on DiscoveryF4Bare target