Clean up the previous commits
Update ChangeLog