Clean out the rewrite branch in preparation for new code