cleanup unused stuff

Change-Id: If6be8d50b38d5032d5607d528525d3e07226cd07