Remove some redundant autoloader logic