CSS cleanup - finally?