Classes cleanup