Remove credential-related stuff from shim