Removed autoloading