Got rid of any instance stubbing