Clean up klasses