diff --git a/ci/lint.sh b/ci/lint.sh
index 54135bd551b69..35b39e2abb3c6 100755
--- a/ci/lint.sh
+++ b/ci/lint.sh
@@ -120,6 +120,10 @@ if [ "$LINT" ]; then
 
     echo "Check for deprecated messages without sphinx directive"
     grep -R --include="*.py" --include="*.pyx" -E "(DEPRECATED|DEPRECATE|Deprecated)(:|,|\.)" pandas
+
+    if [ $? = "0" ]; then
+        RET=1
+    fi
     echo "Check for deprecated messages without sphinx directive DONE"
 else
     echo "NOT Linting"
diff --git a/doc/source/whatsnew/v0.23.0.txt b/doc/source/whatsnew/v0.23.0.txt
index 800599f728de1..6044d0b5e5017 100644
--- a/doc/source/whatsnew/v0.23.0.txt
+++ b/doc/source/whatsnew/v0.23.0.txt
@@ -313,6 +313,7 @@ Removal of prior version deprecations/changes
 - The ``freqstr`` keyword has been removed from ``pandas.tseries.frequencies.to_offset`` in favor of ``freq`` (:issue:`13874`)
 - The ``Panel4D`` and ``PanelND`` classes have been removed (:issue:`13776`)
 - The ``Panel``class has dropped the ``to_long``and ``toLong`` methods (:issue:`19077`)
+- The options ``display.line_with`` and ``display.height`` are removed in favor of ``display.width`` and ``display.max_rows`` respectively (:issue:`4391`, :issue:`19107`)
 
 .. _whatsnew_0230.performance:
 
@@ -369,7 +370,7 @@ Conversion
 - Bug in :class:`Series` floor-division where operating on a scalar ``timedelta`` raises an exception (:issue:`18846`)
 - Bug in :class:`FY5253Quarter`, :class:`LastWeekOfMonth` where rollback and rollforward behavior was inconsistent with addition and subtraction behavior (:issue:`18854`)
 - Bug in :class:`Index` constructor with ``dtype=CategoricalDtype(...)`` where ``categories`` and ``ordered`` are not maintained (issue:`19032`)
-- Bug in :class:`Index` constructor with ``dtype=CategoricalDtype(...)`` where ``categories`` and ``ordered`` are not maintained (issue:`19032`) 
+- Bug in :class:`Index` constructor with ``dtype=CategoricalDtype(...)`` where ``categories`` and ``ordered`` are not maintained (issue:`19032`)
 - Bug in :class:`Series`` with ``dtype='timedelta64[ns]`` where addition or subtraction of ``TimedeltaIndex`` had results cast to ``dtype='int64'`` (:issue:`17250`)
 - Bug in :class:`TimedeltaIndex` where division by a ``Series`` would return a ``TimedeltaIndex`` instead of a ``Series`` (issue:`19042`)
 - Bug in :class:`Series` with ``dtype='timedelta64[ns]`` where addition or subtraction of ``TimedeltaIndex`` could return a ``Series`` with an incorrect name (issue:`19043`)
diff --git a/pandas/core/config_init.py b/pandas/core/config_init.py
index c3307c60b8ed9..da42cdbf10233 100644
--- a/pandas/core/config_init.py
+++ b/pandas/core/config_init.py
@@ -11,8 +11,7 @@
 """
 import pandas.core.config as cf
 from pandas.core.config import (is_int, is_bool, is_text, is_instance_factory,
-                                is_one_of_factory, get_default_val,
-                                is_callable)
+                                is_one_of_factory, is_callable)
 from pandas.io.formats.console import detect_console_encoding
 
 # compute
@@ -170,11 +169,6 @@ def use_numexpr_cb(key):
     frame is truncated (e.g. not display all rows and/or columns)
 """
 
-pc_line_width_doc = """
-: int
-    Deprecated.
-"""
-
 pc_east_asian_width_doc = """
 : boolean
     Whether to use the Unicode East Asian Width to calculate the display text
@@ -223,11 +217,6 @@ def use_numexpr_cb(key):
     terminal and hence it is not possible to correctly detect the width.
 """
 
-pc_height_doc = """
-: int
-    Deprecated.
-"""
-
 pc_chop_threshold_doc = """
 : float or None
     if set to a float value, all float values smaller then the given threshold
@@ -344,13 +333,8 @@ def table_schema_cb(key):
                        validator=is_one_of_factory([True, False, 'truncate']))
     cf.register_option('chop_threshold', None, pc_chop_threshold_doc)
     cf.register_option('max_seq_items', 100, pc_max_seq_items)
-    cf.register_option('height', 60, pc_height_doc,
-                       validator=is_instance_factory([type(None), int]))
     cf.register_option('width', 80, pc_width_doc,
                        validator=is_instance_factory([type(None), int]))
-    # redirected to width, make defval identical
-    cf.register_option('line_width', get_default_val('display.width'),
-                       pc_line_width_doc)
     cf.register_option('memory_usage', True, pc_memory_usage_doc,
                        validator=is_one_of_factory([None, True,
                                                     False, 'deep']))