Some cleanup; use Libertine as mathrm also