Removed more swift autoloading