Clean up after shim; add repo api without implementation