We dont need these anymore

Change-Id: I2c7639a3e50660e3358c1fcf1033fa91c25041be
Cleanup more useless info

Change-Id: I4078a2b9640ceb2f0d97192c3fb451615f6f3845