Cleanup of all features: fix all overrides.