fix
working
fix remove unnessary code