Simplify blacklist storage API
Simplify networks storage API
Fix refactoring issues, refine tests
Fix uplink report
Cleanup