Removed defunct code