Use joinLikeSync instead of join (and TODO cleanup)

Use joinLikeSync instead of join (and TODO cleanup) #3621