Removed some debugging code ...