Remove weird sentence
Remove obsolete flapping options from the code

I've also modified a test that was using one of those old options in
order to make sure options are set properly. Now that test uses an
option that still exists in order to test the same thing.

Ref #616