removed obsoleted code