Removed debugging print lines, cleaning up in preparaton for merge into master. For Ticket #129.