Temp class removed