remove old stuff from tracking and add Serena stuff