Prune dead code

This removes the code that was marked for deletion.