Cleanup of case classes.