Removed some debug logging and comments