Use target platform instead of the build.
Delete unnecessary CVS leftovers.