Adding conflate in LQ + cleanup