More clean up for Physics module.