Get rid of manual autoloading code