Remove old fringe code, add variables pertinent to topic (in-progress)