Update reversion for trunk
Code cleanup