remove before modify