DELTASPIKE-507 cleanup