Remove various dictionaries for a smaller KB

Change-Id: Ie212eb9b053612e44d694f0be045e185d52532c8