Added removal of inserted methods to class method mocking