updated/cleanup of value mapper plugin