delete unused
and another one
some cleaning and fixes