cleanup for the cfg.layout generator