ADEV-9 delete stuff

Only deleting stuff here. Look at the individual commits if you want to see what's deleted