Added remove prefix.
fixed revoke_prefix commands.
Merge branch 'test' into dev