Merge "Remove unused CSS styles"