remove extra class and add in networking from base.