remove deprecated variable usage