also remove unused files and force-fix errors using pocheck Change-Id: If95f38febdf34951193d67b1eb7a8fbfd292474d
Change-Id: I1705f7d9e76a20f378992412209f1920213bf314