Cleaned up hash-join