Remove MOAR overrides