Cleaup to make warning-safe.