ESSENTIALS-229: Remove "overruled" code.
ESSENTIALS-229: Remove unused dependency