commit before changing remove to two functions