* unrevivable trait + remove unclonable remnants * cleanup * change to hascomp (cherry picked from commit 7a2e500f689738b64abc24929e8d4a387749ba64)