finish moving wcf out of the core