Refactor to remove dependency on cattle/server