rewrite: remove deprecated stuff

This cleans out all the old stuff that won't be needed anymore.