removed some join nodes and related code