Fix removing of hoisted variable moved to another storey