Merging cloudmodel remove with new network stack