cleaned-up imports, ProofSamples left behind