removing defer