nice clean up including the factory_girl methods.