Clean up Monoid stuff