Comment unused code
Merge branch 'Feature-ijoin'