Clean up. Examples fixed for scoped features extracted.