cleanup params; now final version