Remove debug code, add more responses