Simplify osm commands

Change-Id: I0062f0eb338d251804b1797eaea8c7d220969cce