Remove network dependency