more cleanups, more fun.