I think just depending upon the autoloader is good enough, so we can probably just remove the call completely?