completed refactoring of Joins and ColumnPairs, A lot of code cleanup