Finished class cleanup