CON-1791: Remove tested code