Clean-up from commit