cleanup more relics and traits