more cleaning
and stubs added