Removed diagnostic cruft used during testing. Other code modifications in preparation for code review. Signed-off-by: Vincent Reher <tde@4reher.org>