remove conditional logic