Merge "remove user to avoid permisson issue"