Remove tuple handling