[CLC-961] Cleanup