Cleanup, fix for FoogleDD missing