Refs #113 Updated remove/add logic, using change type as indicator on what to do.