Get rid of unused class