Massive deletions and additions to mirror current status on Adam's server.