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