Cleanup: removing features that aren't needed, and removing lines that
were eventually commented out anyway.