refactor - remove rekuire