Update and hide autoloader, remove unnecessary loading code