Removed traces and fixed size recursion