Just cleanup class