before I remove redundant code