Cleaned up changes brought over from another project.