Cleaning up CSS

Fixing some optimizations I did before.
Removing cruft code.