Cleanup of feature defaults