Code cleanup for distribution release.