Remove recursion for now