Add parameter pool clean-up + simplify code

Remove dynamic output parameters not set in the Data Source