Clean up in layouts