remove non-autoloading code, loosen up Bundle version requirement [ci skip]