clean up remaining factory_girl stuff