Clean up --help (try 2)

Use this instead