removed double join