Cleanup (squash commit).