Remove function definition and update recursives