On a related note, are tests passing with this code removal?