Remove user module

Change-Id: Ie0b9147f0cb147bcb4f97b81fdc4bafe55565c77