removing obsolute code