[CHA] Removed unused codes