removed obsoletes stuff
cleaned a bit