Minor changes; Remove debug client ID