A bit of cleanup since that code is about to go away