removed obsolte code/comments