Initial removal of NZB function
Cleanup
Merge remote-tracking branch 'origin/Remove_NZB' into develop