Got rid of stubs