ad079a5 clean some more