GitLab

Remove old methods that were replaced by onUser* methods, rename methods
with unclear names, and add userId parameters to all operations that
operate with per user state.

Change-Id: I846fbb0a5ad17b4ee4c0c759fd1fd23f58b88d78