cleanup; remove api; lib select etc.