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