removed again some unused lines