Reorganized partials a little.
Delete tokens.