Removes unnecessary special case handling.