bug fix and cleanup for custom serialization parsing