More cleanup to post proc.