We can use this to remove any kind of nvindex, hence give it a generic name. Also instead of passing "NONE" as session if none is specified, pass PASSWORD instead, so that the function actually becomes useful if no session is specified (the only user so far, pcrlock always provides a session, hence this is no change in behaviour).