Safety commit before clean-up