Drop many comment and untested code.