If you think about it, try to remove commented out stuff so we don't end up with stray comments (that aren't explaining code) all over the place.