expandable list view library rempved and code cleanup....