Got rid of unused class