MADS: Removed M4-specific code. Keeping engine MADS-specific for now