Removing Redundant Code and Reorganization.

[raguay]

Title tells it all. I think there was a small bug fix as well.

---

This discussion was created from the release Removing Redundant Code and Reorganization..