Case class cleanup