Remove unused import
Add the correct infix annotations
Convert to the new documentation format, adding in infix declarations