New CampusInfo class / cleanup