forgot to remove redundant code