Remove m hack for scheduler