Further cleanup to prompt.