cleanup to eval and sort scripts