Cleanup for format-1 release

Simplified parameters for format-1, etc.