Remove debugger references
Account for left joins