REFACTOR: Removed obsolete conditional logic