Fixed bug where saving options kept removed keys