[OE-4071] Remove dead code and tables.