remove unimpaired
add unimpaired to the correct location