Merge "Remove extra style we dont use." into pi-car-dev