cleanup :-)
cleanup to face unordered