wip remove redundant code