Ditched some redundant code