clean up some mantle converting stuff with john