Clean up from earlier commits.