reduced cid and id setin Activity into a single set

reduced cid and id setin Activity into a single set