More cleanup, wip first join