Cleaning up other commits.