Add some missing qqq messages, remove unused messages

Change-Id: Ib1b5ad3ff6a516b2a2e76d1ac3a18a0016636e32
Merge "Add some missing qqq messages, remove unused messages"