Some code cleanup prior to release.