Remove listener classes and put completion blocks into MCCClient methods