Cleanup in layout