oh yeah, I guess that's all deletable now, everything in the rewrite seems to work for me.