Cleanup and get rid of the serializer that used xjst ast