getting rid of fathom specific code