Removing calls to require_once