PEP cleanup in idcard