Remove lingering detritus from refactor