Removing defunct uses