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