Removed any dependencies on NTFY_DISPERSY