Remove now-unnecessary edge case handling