XAR cleanup to pass maven build tests.