autofoo cleanups