Refactor to remove unnecessary requires