mathlib3

f6e990c6 - revert deletions and minor stuff