Remove unused code, also broken by previous commits.