remove unused code paths dealing with defaults