Clean up code to prepare for next release.