remove special case handling where it shouldn't be