Remove surplus added, and few changements.