Applying cleanup from css-controls excursion