DELTASPIKE-785 minor cleanup