Cleanup on layout