Remove outdated conditional check