Code cleanup to satisfy build process