enhancement-removed redundant code related to bug2075