Fix more bugs in section remove