Cleanup.
Added new Expression proto.