Agreed. We can clean some of that when we cleanup the CSS a bit.