Some cleanups of unused/unsafe methods
Moved load/save methods to Network, updated some manifests and started cleanup of Optimization