remove redundant code from V2

#51