Allow single file source values, move cleanup to after task

Cleanup may move/go away as we figure out cacheing.