fix cleanup concept