Clean up serdes with singleton patterns