Ensure that device sections are only automatically removed after all related options have been parsed, to avoid prematurely deleting sections. Signed-off-by: Jo-Philipp Wich <jo@mein.io> (cherry picked from commit 2072c66c5a4b755a6ed16bb6486afb956a475be9)