CON-782 | Remove old code

DO NOT MERGE