removed obsolete special case logic