Remove unnecessary special case