Fix removing structures