Clean up initial version.