#71 Removed Debug code