[FIX] fixed serializer, clean up