Revert "refactor some of the parameter handling into Parameter class"

This reverts commit 6748b6160468e23057217b49a3d830cd134a7646.