Simplify vendor for L / Remove unused things for now

Change-Id: I5a0b06eb56f4c0eef35ef4714df57b06066ed859