removed obsolet nonsense code