added optimization hack for tree table and remove debugger statement