Added cleanup to trader