Simplify fix for dispose. Simplify take