Pulled out some corp-specific stuff