Remove unnecessary conditional logic until needed