remove debug log messages, couple of minor things to do but basically done