Clean-up after class