Squashing unimportant cleanup commits