removed obsoleced code. There was a lot...