Some of the ivory cleanup work

Just wanted to get this out so the list of changes doesn't get too big
Can the serializer and deserializer be moved back to the instance level now that one of these is created per job?