Noticed some unnecessary code