Removed redundant autoloads