Further cleanup of serlization classes

Change-Id: Id1ce1564d99a6dbaa43a07f07f5eb9093969db40
Merge "Further cleanup of serlization classes"