Get rid of unused class
Get rid of unused autoload