Simplify enough to remove dependency