Commenting out debug code, making ready for merge