Added cleanup to remove references