more GetPutF removal

Change-Id: I96bfd894d558bc31721b29c97d73d7778319ea4b