Cleaned up networkservice