Clean up class deserialization as a Map code