Remove explicit format params for now