remove stupid recursion