fix derp and remove unused device trees

Change-Id: I93dcd7aa8ab940cc2f2dbfb674255ab0e555cf8e