Next cleaning further #97