Remove obselete stuff

Change-Id: I5ecbcc6b20d250e75b4912329606728ba5a959f8
What's more legacy than legacy? legacy-legacy

Change-Id: I4c5fec82d97a5abefb5c67e3c86ba56ca597cd71