wip: removing nils