Cleanup leaked rights output and add callgates