final cleanup of layouts