cleanup, missing packages, I blame Hans and his documentation