Cleanup after #2058

Deleting some files that were resurrected by the #2058 PR.