change: remove redundant logics.