Cleanup of ParameterMapping classes