Remove two hardcodings of master.