Clean up following new parameter structure