Remove unneeded stuff after unifying builds

Change-Id: I282ad737b9a640b94b5e9d6aeed56d561760d3e1