forgot to delete lines from last refactor