Removing debugger dependency