Don't add classes to the context

Changes in I174a2e9 make these classes not needed anymore.

Change-Id: I6e1b087df48837c201096ad0b32c74b087bb454b
Merge "Don't add classes to the context"