Toward #1313.

This will involve removing a lot of files, functions, methods, invocations, tests etc. and probably modifying tests too to match new expectations.