Remove references to MR Client Lib