Fix removing