Clean up of class