2nd pass - tie the spells in properly, remove classes entries.