Removed conditional logic