remove redundant code and stub