#468 Removed complicated logic for autoloading that has been obsoleted