Remove skippeFeatures collection

This PR removes the skippedFeatures_ collection as discussed in #2008. This will make "unskipping features" much faster.

That should also fix the issue specifically reported in #2008.