Additional cleanup to Interactable