Clean up NR Equation Solv example

replaced all U references with X.

Added scopes and labels.
Remove Independent Initial Cond block

Remove Independent Initial Cond block and all places where it is used.

Also removed a few commented out lines that were missed during clean up.