Finished testing of Witch, comments removed

Witch finishes testing with drunk and doppelganger. A few extra messages
removed so ready for production.