Finish cleanup of removed extraction refactorings

This cleanup should already have happened in 1eb07fe0dfcd, but some
entries were forgotten. This led to exceptions on startup of the IDE.
Merge pull request #728 from sschaef/cleanup-extraction-refactorings

Finish cleanup of removed extraction refactorings