ParamUpmix Cleanup
Code cleanup, removing unused code.