removing obsolete code
implementing quick join
removing obsolete code