Remove even more files

Experimantal! Maybe needs partial revert

Change-Id: I9a8bc9f67108b605966c18222b9e37f16135ca34