Bug 1021533 - (bug 1018836 follow up) css class cleanup.