Reduce some unnecessary code