Distinct + lazy eval clean up