Cleaned up for intermediate release.