full_ls980: cleanup

Change-Id: I0bc04ae617e48830182eee987fd180fe72aedc04