#60 remove redundant code