Removing useless special case