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