FIX: Remove obsolete check