Remove non-functional parameters from top-level command