cleaning up Factory