Fix removing instances