Taxonomy weight fix and cleanup.