refucktoring done, wiped some stubs