Bit of cleanup in md5 model parsing