Cleanup of commits

Merging of cleanup.