Cleanup the remains of MockBase