Indeed, that's right. I'll create a dedicated issue for the clean-up commits and change their messages.