Making sure that removing options properly cleans up their sections as well