Cleanup, join properly