Further clean up.