Clean Up in old Die class