Some minor updates.
Removing commented code.