[gm] code cleanup.