Deleting stuff

Change-Id: If21fceecb15061ded241e124c3de79253a7c7b7b