removed some factory girl calls