Rigidbody redesign

Some cleaning in rigidbody usage.