More cleanup of post proc.