Remove old variable
Improve header ordering
Only verify permanent relations