deleted unused couple stuff