-- Remove recursion