Merge "Remove check for MW_NO_SETUP"