testing - remove remap