Removed some informal logging and added debug log output