More physics cleanup.