Remove obselete stuff

Change-Id: I5ecbcc6b20d250e75b4912329606728ba5a959f8