Remove unneeded code from autoloader