* Clean up main css for upward merge