Fix iframe teardown & removal