Removed unused code

Removed unused methods, variables, and arguments
from method signature. Method 'remove_user' was
removed because method 'add_user' is unused and if
we never do add_user then no reason to do remove_user.

Change-Id: I0ef900232bc26b91e9cd192ba29a720ff7de27a3
Merge "Removed unused code"