Remove our code from comfy

This code should not be inside of the comfy code.
This code was extracted here: https://github.com/moneyadviceservice/cms/pull/85