Remove factory girl and modle fix