[#950321] Remove shared code that won't be needed anymore.