Some clean up of previous commits.