Clean up Commented Code

[rjbrown2]

There are lots of places we've kept commented out code for reference or reversion. At this point they can all be removed.