remove normalize, add shim