[IMP] remove cup/cig if not present