Some cleanup. We removed code that is not ready for publication.