Cleanup SerDeUtils