removing defunct code