Remove domino dependency & some perf improvements