begin cleanup of fanny's code