MADS: Cleanup of the MADSAction class