Drop leftovers after 02651060b6ce5b16b06721378a239a6d2bd9f528

Change-Id: I011359a47ed47308a7d25e306fbf45a83a3a5715
Reviewed-by: Konstantin Ritt <ritt.ks@gmail.com>