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