Clean up columns in architecture