Remove recurssion