removed defunct code