[OTFC] Remove dead code