#17 Remove stubs