serialization.h cleaning