Cleaning up, getting ready for the rewrite.