More code clean up after HeadsUp

Change-Id: Id8c5d94a97ed59775051d4bdca87c04ec229b95f