cleanup to make switching objects easier