Remove the recursion