[MMC] Clean up wbsd detection handling