Disable cleanmx and handle config options more gracefully