Remove Heads Up (2 of 2)

Squashed removal of heads up feature

Change-Id: Ib13d7a523a3c6517548829130478e687eb31c67a