Removed old, unused code segments.