Remove old stuff

Change-Id: I106201451ccf1983cdd6efce6f812830820ccc94