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