Remove berry styles leftovers

Change-Id: Iec0d48a70d86f2c85a6a3b70a17cc4dc2dd18f3c
7 files changed