Cleanup, docs, made shure Socket is not deleted after a upgrade