remove depricated vars causing issues