cleanup confusion resolved