If something is not relevant to the current scenario, but it is required for the app to work, I'd hide it.

New scenario looks much better.