Isolation fix and remove outdated comments