Revert "Version with remove udapter from listview"