Yes getting rid of this is good