Remove legacy layout helper