Remove unused commands.
Merge branch 'master' into leo-work
Use standard address.