Remove & track packages, cleanup

Change-Id: I4095113277738db70cb92300d2779ee4faa8c440