some cleanup to avoid confusion