Cleaning-up commit