zbk: cleanup