Remove commented out code. That includes the *huge* blob below.